Autogenerated HTML docs for v2.23.0-rc1
diff --git a/RelNotes/2.23.0.txt b/RelNotes/2.23.0.txt index e1b1ce5..e3c4e78 100644 --- a/RelNotes/2.23.0.txt +++ b/RelNotes/2.23.0.txt
@@ -10,6 +10,9 @@ prerequisite patches in an unstable way, which has been updated to compute in a way that is compatible with "git patch-id --stable". + * The "git log" command by default behaves as if the --mailmap option + was given. + UI, Workflows & Features @@ -91,11 +94,6 @@ commit-graph files now, which allows the commit-graph files to be updated incrementally. - * The "git log" command learns to issue a warning when log.mailmap - configuration is not set and --[no-]mailmap option is not used, to - prepare users for future versions of Git that uses the mailmap by - default. - * "git range-diff" output has been tweaked for easier identification of which part of what file the patch shown is about. @@ -347,3 +345,4 @@ (merge fbec05c210 cc/test-oidmap later to maint). (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint). (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint). + (merge d61e6ce1dd sg/fsck-config-in-doc later to maint).
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index f8fc2f7..e4a85ee 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html
@@ -1383,7 +1383,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:24 PDT + 2019-08-02 14:10:52 PDT </div> </div> </body>
diff --git a/git-config.html b/git-config.html index 5e8f927..24117a3 100644 --- a/git-config.html +++ b/git-config.html
@@ -6529,7 +6529,7 @@ <p> If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise - assume <code>--no-use-mailmap</code>. False by default. + assume <code>--no-use-mailmap</code>. True by default. </p> </dd> <dt class="hdlist1">
diff --git a/git-fsck.html b/git-fsck.html index 7457931..f5d9ab3 100644 --- a/git-fsck.html +++ b/git-fsck.html
@@ -923,6 +923,81 @@ </div> </div> <div class="sect1"> +<h2 id="_configuration">CONFIGURATION</h2> +<div class="sectionbody"> +<div class="dlist"><dl> +<dt class="hdlist1"> +fsck.<msg-id> +</dt> +<dd> +<p> + During fsck git may find issues with legacy data which + wouldn’t be generated by current versions of git, and which + wouldn’t be sent over the wire if <code>transfer.fsckObjects</code> was + set. This feature is intended to support working with legacy + repositories containing such data. +</p> +<div class="paragraph"><p>Setting <code>fsck.<msg-id></code> will be picked up by <a href="git-fsck.html">git-fsck(1)</a>, but +to accept pushes of such data set <code>receive.fsck.<msg-id></code> instead, or +to clone or fetch it set <code>fetch.fsck.<msg-id></code>.</p></div> +<div class="paragraph"><p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the +same applies for the corresponding <code>receive.fsck.*</code> and +<code>fetch.<msg-id>.*</code>. variables.</p></div> +<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the +<code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code> variables will not +fall back on the <code>fsck.<msg-id></code> configuration if they aren’t set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values.</p></div> +<div class="paragraph"><p>When <code>fsck.<msg-id></code> is set, errors can be switched to warnings and +vice versa by configuring the <code>fsck.<msg-id></code> setting where the +<code><msg-id></code> is the fsck message ID and the value is one of <code>error</code>, +<code>warn</code> or <code>ignore</code>. For convenience, fsck prefixes the error/warning +with the message ID, e.g. "missingEmail: invalid author/committer +line - missing email" means that setting <code>fsck.missingEmail = ignore</code> +will hide that issue.</p></div> +<div class="paragraph"><p>In general, it is better to enumerate existing objects with problems +with <code>fsck.skipList</code>, instead of listing the kind of breakages these +problematic objects share to be ignored, as doing the latter will +allow new instances of the same breakages go unnoticed.</p></div> +<div class="paragraph"><p>Setting an unknown <code>fsck.<msg-id></code> value will cause fsck to die, but +doing the same for <code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code> +will only cause git to warn.</p></div> +</dd> +<dt class="hdlist1"> +fsck.skipList +</dt> +<dd> +<p> + The path to a list of object names (i.e. one unabbreviated SHA-1 per + line) that are known to be broken in a non-fatal way and should + be ignored. On versions of Git 2.20 and later comments (<em>#</em>), empty + lines, and any leading and trailing whitespace is ignored. Everything + but a SHA-1 per line will error out on older versions. +</p> +<div class="paragraph"><p>This feature is useful when an established project should be accepted +despite early commits containing errors that can be safely ignored +such as invalid committer email addresses. Note: corrupt objects +cannot be skipped with this setting.</p></div> +<div class="paragraph"><p>Like <code>fsck.<msg-id></code> this variable has corresponding +<code>receive.fsck.skipList</code> and <code>fetch.fsck.skipList</code> variants.</p></div> +<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the +<code>receive.fsck.skipList</code> and <code>fetch.fsck.skipList</code> variables will not +fall back on the <code>fsck.skipList</code> configuration if they aren’t set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values.</p></div> +<div class="paragraph"><p>Older versions of Git (before 2.20) documented that the object names +list should be sorted. This was never a requirement, the object names +could appear in any order, but when reading the list we tracked whether +the list was sorted for the purposes of an internal binary search +implementation, which could save itself some work with an already sorted +list. Unless you had a humongous list there was no reason to go out of +your way to pre-sort the list. After Git version 2.20 a hash implementation +is used instead, so there’s now no reason to pre-sort the list.</p></div> +</dd> +</dl></div> +</div> +</div> +<div class="sect1"> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> <div class="paragraph"><p>git-fsck tests SHA-1 and general object sanity, and it does full tracking @@ -1046,7 +1121,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-03-20 00:15:37 PDT + 2019-08-02 14:10:40 PDT </div> </div> </body>
diff --git a/git-fsck.txt b/git-fsck.txt index e0eae64..d72d15b 100644 --- a/git-fsck.txt +++ b/git-fsck.txt
@@ -104,6 +104,11 @@ progress status even if the standard error stream is not directed to a terminal. +CONFIGURATION +------------- + +include::config/fsck.txt[] + DISCUSSION ----------
diff --git a/howto-index.html b/howto-index.html index 080eb5d..0afd984 100644 --- a/howto-index.html +++ b/howto-index.html
@@ -885,7 +885,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:15 PDT + 2019-08-02 14:10:43 PDT </div> </div> </body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 1c9706e..a3d12f3 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:33 PDT + 2019-08-02 14:10:47 PDT </div> </div> </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 79142ef..a83d3b2 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html
@@ -1435,7 +1435,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:33 PDT + 2019-08-02 14:10:47 PDT </div> </div> </body>
diff --git a/howto/new-command.html b/howto/new-command.html index e20f71e..17bce56 100644 --- a/howto/new-command.html +++ b/howto/new-command.html
@@ -863,7 +863,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:29 PDT + 2019-08-02 14:10:44 PDT </div> </div> </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index d3e6ecd..7dbac81 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:33 PDT + 2019-08-02 14:10:47 PDT </div> </div> </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 6a1d6da..9943b07 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:33 PDT + 2019-08-02 14:10:47 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 19eac75..37ee0d3 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:32 PDT + 2019-08-02 14:10:46 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index e1ed936..d4a1490 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:32 PDT + 2019-08-02 14:10:47 PDT </div> </div> </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 84debb3..820c8d5 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:31 PDT + 2019-08-02 14:10:46 PDT </div> </div> </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 0d0308c..78bb4fa 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:29 PDT + 2019-08-02 14:10:44 PDT </div> </div> </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 106f60e..4790e3d 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:31 PDT + 2019-08-02 14:10:46 PDT </div> </div> </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 1532659..fb4a399 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:31 PDT + 2019-08-02 14:10:46 PDT </div> </div> </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index d9485ab..1f60680 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:31 PDT + 2019-08-02 14:10:45 PDT </div> </div> </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 8ece431..099aeef 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:30 PDT + 2019-08-02 14:10:45 PDT </div> </div> </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 609a6b9..1a72507 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:30 PDT + 2019-08-02 14:10:44 PDT </div> </div> </body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 5d24eaa..37d8104 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-08-01 10:59:30 PDT + 2019-08-02 14:10:45 PDT </div> </div> </body>
diff --git a/technical/api-index.html b/technical/api-index.html index 957c032..a4ffad7 100644 --- a/technical/api-index.html +++ b/technical/api-index.html
@@ -880,7 +880,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:28 PDT + 2019-08-02 14:10:55 PDT </div> </div> </body>
